From 85d8b3f999b6ec57823ff130fbaf64dcee5ae98e Mon Sep 17 00:00:00 2001
From: robertl <robertl@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Fri, 16 Feb 2007 00:31:48 +0000
Subject: [PATCH] Don't make "smart" (typ. geocaching) names the default.  -N
 now silently eaten. Add -S.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2673 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/defs.h     |  4 ++--
 gpsbabel/garmin.c   |  6 +++---
 gpsbabel/kml.c      | 11 ++++++++---
 gpsbabel/magproto.c |  2 +-
 gpsbabel/main.c     | 21 +++++++++++++++++++++
 gpsbabel/util.c     |  2 +-
 6 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 8262323ea..0c8e081a5 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -151,8 +151,8 @@ typedef struct {
 	gpsdata_type objective;
 	unsigned int	masked_objective;
 	int verbose_status;	/* set by GUI wrappers for status */
-	int no_smart_icons;	
-	int no_smart_names;
+	int smart_icons;	
+	int smart_names;
 	cet_cs_vec_t *charset;
 	char *charset_name;
 	inifile_t *inifile;
diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index f43b5a18f..69d906a40 100644
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -572,13 +572,13 @@ waypt_write_cb(GPS_PWay *way)
 }
 
 /* 
- * If we're not using smart icons, try to put the cache info in the
+ * If we're using smart names, try to put the cache info in the
  * description.
  */
 const char *
 get_gc_info(waypoint *wpt)
 {
-	if (global_opts.no_smart_icons) {
+	if (global_opts.smart_names) {
 		if (wpt->gc_data.type == gt_virtual) return  "V ";
 		if (wpt->gc_data.type == gt_unknown) return  "? ";
 		if (wpt->gc_data.type == gt_multi) return  "Mlt ";
@@ -636,7 +636,7 @@ waypoint_write(void)
 		}
 		way[i]->ident[sizeof(way[i]->ident)-1] = 0;
 
-		if (!global_opts.no_smart_icons && 
+		if (global_opts.smart_names && 
 		     wpt->gc_data.diff && wpt->gc_data.terr) {
 	                snprintf(obuf, sizeof(obuf), "%s%d/%d %s", 
 					get_gc_info(wpt),
diff --git a/gpsbabel/kml.c b/gpsbabel/kml.c
index 34c96ffb2..c544a041f 100644
--- a/gpsbabel/kml.c
+++ b/gpsbabel/kml.c
@@ -676,8 +676,13 @@ static void kml_waypt_pr(const waypoint *waypointp)
 		else
 			fputs(odesc, ofd);
 
-		if (!global_opts.no_smart_icons && 
-		     waypointp->gc_data.diff && waypointp->gc_data.terr) {
+		/* It's tempting to conditionalize this on smart_names, but
+		 * KML is so robust that it makes sense to just always do
+		 * this for geocaches.  (Plus the convenience of being able
+		 * to do a drag-n-drop into Earth without extra option is a 
+		 * win.)
+		 */
+		if (waypointp->gc_data.diff && waypointp->gc_data.terr) {
 			if (waypointp->gc_data.placer) {
 				char *p = xml_entitize(waypointp->gc_data.placer);
 				fprintf(ofd, "<![CDATA[<i> by %s</i>]]>", p);
@@ -713,7 +718,7 @@ static void kml_waypt_pr(const waypoint *waypointp)
 		kml_write_xml(-1, "</IconStyle>\n");
 		kml_write_xml(-1, "</Style>\n");
 
-	} else if (!global_opts.no_smart_icons && waypointp->gc_data.diff && waypointp->gc_data.terr) {
+	} else if (waypointp->gc_data.diff && waypointp->gc_data.terr) {
 		char *is = kml_lookup_gc_icon(waypointp);
 		kml_write_xml(1, "<Style>\n");
 		kml_write_xml(1, "<IconStyle>\n");
diff --git a/gpsbabel/magproto.c b/gpsbabel/magproto.c
index 44c704888..ee763d488 100644
--- a/gpsbabel/magproto.c
+++ b/gpsbabel/magproto.c
@@ -1254,7 +1254,7 @@ mag_waypt_pr(const waypoint *waypointp)
 	odesc = isrc ? isrc : "";
 	owpt = mag_cleanse(owpt);
 
-	if (!global_opts.no_smart_icons &&
+	if (global_opts.smart_icons &&
 	    waypointp->gc_data.diff && waypointp->gc_data.terr) {
 		sprintf(ofmtdesc, "%d/%d %s", waypointp->gc_data.diff, 
 			waypointp->gc_data.terr, odesc);
diff --git a/gpsbabel/main.c b/gpsbabel/main.c
index 3051c5b9f..6c1aabfb3 100644
--- a/gpsbabel/main.c
+++ b/gpsbabel/main.c
@@ -426,6 +426,12 @@ main(int argc, char *argv[])
 				global_opts.masked_objective |= POSNDATAMASK;
 				break;
 			case 'N':
+#if 0
+/* This option is silently eaten for compatibilty.  -N is now the
+ * default.  If you want the old behaviour, -S allows you to individually
+ * turn them on.  The -N option will be removed in 2008.
+ */ 
+
 				switch(argv[argn][2]) {
 					case 'i':
 						global_opts.no_smart_icons = 1;
@@ -438,7 +444,22 @@ main(int argc, char *argv[])
 						global_opts.no_smart_icons = 1;
 						break;
 				}
+#endif
 				
+				break;
+			case 'S':
+				switch(argv[argn][2]) {
+					case 'i':
+						global_opts.smart_icons = 1;
+						break;	
+					case 'n': 
+						global_opts.smart_names = 1;
+						break;
+					default:
+						global_opts.smart_icons = 1;
+						global_opts.smart_names = 1;
+						break;
+				}
 				break;
  			case 'x':
 				optarg = argv[argn][2]
diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index c0debfcc8..1af7d25e6 100644
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -839,7 +839,7 @@ month_lookup(const char *m)
 const char *
 get_cache_icon(const waypoint *waypointp)
 {
-	if (global_opts.no_smart_icons)
+	if (!global_opts.smart_icons)
 		return NULL;
 
 	/*
-- 
2.30.2